bitkeeper revision 1.1389.5.4 (4277b86czqxlqC40s7HyXb3A25SZkQ)

Fix domU SMP build.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
index 94ab4fd89f4d1a996988ec276ce2181d27b8907c..36f313364f08ae761ac47336fefc704a2f5363a1 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
@@ -37,7 +37,7 @@
 
 /* Have we found an MP table */
 int smp_found_config;
-unsigned int __initdata maxcpus = NR_CPUS;
+extern unsigned int maxcpus;
 
 /*
  * Various Linux-internal data structures created from the

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
index 2d385c1c092e7558e4c420b9c7e3b813c56bc152..772815d4b24a556ee919f71035e6e6fe52873637 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -67,6 +67,8 @@ static struct notifier_block xen_panic_block = {
 
 int disable_pse __initdata = 0;
 
+unsigned int __initdata maxcpus = NR_CPUS;
+
 /*
  * Machine setup..
  */
@@ -785,8 +787,6 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                 * maxcpus=N at enumeration-time can be used to disable HT.
                 */
                else if (!memcmp(from, "maxcpus=", 8)) {
-                       extern unsigned int maxcpus;
-
                        maxcpus = simple_strtoul(from + 8, NULL, 0);
                }
 #endif